From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 27 Mar 2020 15:36:04 +0000 (+0100)
Subject: data: Don't clone cldr2json when updating OSK layouts
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~41
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f3ba1e65ba16acb73d51d3cbcf70dce7863d47b2;p=gnome-shell.git

data: Don't clone cldr2json when updating OSK layouts

Meh, we imported the module so we don't have to go through another
upstream to make changes to the script, but then ended up not using
the fork at all.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1136
---

diff --git a/data/update-osk-layouts.sh b/data/update-osk-layouts.sh
index 72f33fef6..8d78c0ee3 100755
--- a/data/update-osk-layouts.sh
+++ b/data/update-osk-layouts.sh
@@ -1,10 +1,9 @@
 #!/bin/env bash
 
 CLDR_LAYOUTS_TARBALL="http://www.unicode.org/Public/cldr/latest/keyboards.zip"
-CLDR2JSON_GIT="git://repo.or.cz/cldr2json.git"
 
 WORKDIR=".osk-layout-workbench"
-CLDR2JSON="$WORKDIR/cldr2json/cldr2json.py"
+CLDR2JSON="cldr2json/cldr2json.py"
 SRCDIR="$WORKDIR/keyboards/android"
 DESTDIR="osk-layouts"
 GRESOURCE_FILE="gnome-shell-osk-layouts.gresource.xml"
@@ -20,7 +19,6 @@ mkdir -p "osk-layouts"
 # Download stuff on the work dir
 pushd $WORKDIR
 gio copy $CLDR_LAYOUTS_TARBALL .
-git clone $CLDR2JSON_GIT
 unzip keyboards.zip
 popd